{non-gerrit}/qt-labs/widgets-ng.git/bin, branch master

Merge commit 'qt/master'

2009-08-13T08:27:51+00:00

Conflicts:
	examples/opengl/samplebuffers/glwidget.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/gui/gui.pro
	tests/auto/qhttp/tst_qhttp.cpp
	tests/auto/qkeyevent/tst_qkeyevent.cpp

Replace some mentions of Trolltech with more appropriate terms.

2009-08-12T07:04:56+00:00

Reviewed-by: Trust Me

Update license headers according to commit 858c70f768e.

2009-08-06T13:41:40+00:00

RevBy:    Trust me

Merge commit 'qt/master-stable'

2009-08-06T07:18:48+00:00

Conflicts:
	configure.exe
	doc/src/classes/qnamespace.qdoc
	examples/examples.pro
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qobject.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qstandardgestures.h
	src/gui/kernel/qwidget.cpp

Merge AudioServices into mainline.

2009-08-05T04:26:56+00:00

Merge commit 'qt/master-stable' into 4.6-merged

2009-06-30T09:21:56+00:00

Conflicts:
	.gitignore
	configure.exe
	src/corelib/concurrent/qtconcurrentthreadengine.h
	src/corelib/global/qnamespace.h
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qwidget.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkaccesshttpbackend.cpp
	tests/auto/network-settings.h
	tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
	tests/auto/qvariant/tst_qvariant.cpp

Merge commit 'origin/4.5'

2009-06-23T10:32:42+00:00

Conflicts:
	src/sql/drivers/psql/qsql_psql.cpp

Attempt to fix header installation for Phonon.

2009-06-23T09:58:15+00:00

This is the long-standing issue of whether Phonon headers should be
written with a capital P or a lowercase one. KDE releases of Phonon
had  whereas Qt 4.4 had .

I tried to solve this before by adding a Phonon subdir next to phonon
in include/, but that only compounded the error: the presence of two
dirs caused problems and the installation wasn't fixed.

So instead try to place Phonon/ClassName inside include/phonon. And
fix the installation to do it properly: just copy the include/$lib dir
into the target, then overwrite the .h files with the sources from
src/$lib.

Reviewed-by: Marius Storm-Olsen

Integrate the OpenVG graphics system into Qt 4.6

2009-06-22T23:54:49+00:00

This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.

Patching capabilities now patches also the pkg file UID.

2009-06-18T12:10:31+00:00